From: Joakim Verona <joakim@verona.se>
Date: Thu, 22 Aug 2013 18:42:15 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fffcc46aabbe28b6f2ef8427f858abe58d3b615e;p=emacs.git

merge from trunk
---

fffcc46aabbe28b6f2ef8427f858abe58d3b615e